Start splitting smartname flag into finer precision.

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index a5bef70a7aadc581bec26c6afc29a7dc40543f2c..4ac800dcbc1f5bef3dac16dc45454982cbfebc85 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -87,6 +87,7 @@ typedef struct {
        unsigned int    masked_objective;
        int verbose_status;     /* set by GUI wrappers for status */
        int no_smart_icons;     
+       int no_smart_names;     
 } global_options;
 
 extern global_options global_opts;

diff --git a/gpsbabel/main.c b/gpsbabel/main.c
index 3f17ab95c5ec36c25202f818c5f87298a1e92bc0..2b1afdfe411f0c0a2e90bdcc3d095051d67ac1cb 100644 (file)
--- a/gpsbabel/main.c
+++ b/gpsbabel/main.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002 Robert Lipe, robertlipe@usa.net
+    Copyright (C) 2002-2005 Robert Lipe, robertlipe@usa.net
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -203,7 +203,19 @@ main(int argc, char *argv[])
                                global_opts.masked_objective |= RTEDATAMASK;
                                break;
                        case 'N':
-                               global_opts.no_smart_icons = 1;
+                               switch(argv[argn][2]) {
+                                       case 'i':
+                                               global_opts.no_smart_icons = 1;
+                                               break;
+                                       case 'n':
+                                               global_opts.no_smart_names = 1;
+                                               break;
+                                       default:
+                                               global_opts.no_smart_names = 1;
+                                               global_opts.no_smart_icons = 1;
+                                               break;
+                               }
+                               
                                break;
                        case 'x':
                                optarg = argv[argn][2]